Various accumulated fixes