Fixing some bugs?