#80 Fix some issues