More spa fixes for compiling correctly