fixed compilation stuff