Fix reported issues