A few fixes so that the skeleton code compiles