fixing static issues