Replace custom meta compat implementation with six
Add support for forced uploads