Fixed: some smaller issues