Fix misc. Issues and checks