cleanup, fix compilation