Fixed smaller things