Coldwave and knight fixes