Fixed assets-related bugs