minor Bug fixes