Misc

Bug fixes, swapped mounts around.