some fixes, replaced one of the defines by mistake