Progress on some bugs