Minor fixes

:smile: