Quick Bug fixes