Fixes for my new fileserver hardware