Fix class constants and static (lazyness)