some fixes :P