Short fixes