Small fixes

Read commit messages for detailed info.

Signed-off-by: Antes <antes@simplemachines.org>