Fixes to features