Additional fixes for 551b971