e59e484 Various content fixes