Fixed lots of niggly bugs across a number of extensions
Fixed lots of niggly bugs across a number of extensions