Fixes for case-sensitive fs