2014 updates and fc20 compat