Fixed additional strict issues