Fix a couple things that were bugging me
Fix a couple minor annoyances in PJL