Fix some apt source order issues, add node js and jre back