Other non-critical quick fixes