some small general fixes

fixes #2030
fixes #2023
fixes #2022
Signed-off-by: Antes <antes@simplemachines.org>