Kay's fixes