Some little changes to make it easier to test new feature without breaking everything