Make package buildable on F16/17