Other minor changes + Ubuntu SSL error fix