Small fixes for several snafus