Various fixes to new features