Fedora/Mac fixes added for some users