small items fixes