fs stop fixes