Fix small stuff in last commit