Fixed several Blueprint validation issues caught by Apiary