Small fixes for me