More updates: some fixes