static fixes and system updates