Some fixes for the last commit