Small fixes, mainly endpoint format