Fix undefined access.
Small tweaks.