All static issues fixed!