Fixes in rendering + various