Some more small additions/removals