Small changes to enable source maps