FORGE-1114: Added more minor stuff. Still not working