Basic Components fix.