Minor/Major fixes