Bug fixes for PC increments