Fixes to recover from reqiurejs