Incorporate proposals by /u/Yersenia and /u/ifisch5