Build Fix; States improvements