Small bugfix and renamed fields.