Fixed more things asked by the sponsor