4.3 Code cleanup and bug fixes