more estrict fixes