Minor changes to please master alcyone