Fixed smalls issues