Minor fixes

:baby: