Fix optional dependancies.