Moved common fixes to main repo directory