Fixes in server push