Fixes to work with POST requests