Added some correction for static issues