Some more fixes

:+1: