Small fixes for today's work