components fixes