Minor behavior changes..