Ubuntu session and build patches @ MaxWallstedt