Some overall fixes