plymouth related fixes