Proper fixes for #10