some minor fix :P