some fixes for local usage