Category bugs fixed