Fixes for renamed spotless dev branch.