Other fixes + rendering