Fix misc things