Fixes/Updates: various