#9 Some hot fixes