Should fix NoCSRF required issue on the API
Various fixes