Some small fix