Some quick fixes for now