More skeleton file fixes