Pembrey: Quick Patch

This patch just fixes some minor bugs.