Fixes and random works