Fixed some static information just so that things are working properly for the time being.

However, they are changing in the real implementation of the system