Minor fixes for me