ticket:1: Fixing static stuff