Small fixes

:shipit: