Minor improvements over last commit