Feature fix field sizes