Some fixes related to Recent thanks to @emanuele
Signed-off-by: Antes <antes@simplemachines.org>