small fixes

fixes #1744
fixes #1832

Signed-off-by: Antes <antes@simplemachines.org>