Fixing last minor issues