Railtie fix
Various things