Fixes

Just some small fixes done from my laptop.