Various quick fixes