Commit 4.22 (Minor Bug Fixes)