Some fixes

As the title suggests.