More bug fixin