Small module/action js loading fixes