Solo fixes