Smalla fixes