fixes for the latest few commits