Still cleaning up bugs in recent features