Misc old changes being commited for sync