Fixes to resourcemanager

Signed-off-by: Markus Tillman <reetopps6@hotmail.com>