Minor changes to fix automatic builds