commit before portability checks