Fixes for strict mode