Small Fixes
JLK