Fixes to get/set