Removed some unnecessary type casts.
Added some forgotten calls to free.