slight changes to enable compile without warnings