Fixes found during initial debugging...