Commit more 5.4 Fixes