Fixed additional bugs