Fix broken features

Simple features clean up