Smalll fixes