Default arguments and various fixes.