System contant fixes