Fixing some things for bin/ runtime