Fix misc wrappers