Some small changes and some small IMC stuff for WaslieCore