Some fixes related to Recent

fixes #1508
fixes #1496

Signed-off-by: Antes <antes@simplemachines.org>

My bad sorry it should be @emanuele45 :/