POST data amond other fixes