Small fixes and added the corresponding launchpad issue