Fixes, merged to master