Bug fixes- medium priorities