Fixes

One module overwrites the other. Probably uml controller issue has something similar.