Fix misc stuff