Fixed simple stuffs