Giving things the eclipse once-over so it all compiles