Adds more server push checks as per spec 06 tells