More bug fixin'