Bug fixes regarding extensions and variable names.