Small fixes for