Fixed minor stuff