minor changes to ensure everything is compilable