Minor fixes and added missing formats