small fixes and Crypto change merged

Signed-off-by: Stefano Leccese <stefano-leccese@visiongamestudios.de>