Fix FC007 and FC011 to make Travis happy