Bugs solved

:+1: