story changes: Fix some -porcelain issues