Fixed the static things