Numerous minor fixes