Fix inheritance issues and direction bug