Fix misc