fixes to how express is included