And fixed another build error...

Fixing some Bugs...
Thanks @siracuervo for pointing me.
Updated ChangeLog