Quick hiccup fixes