more hack fixes