Minor Commit 4

More compatability issue fixes