fix remaining compile errors. ISsue #24