Some quick fixes, mostly audio