FW: More fixes and cleanup