Additional fixes to features