Tested & fixed issues

Found & fixed multiple warnings in test environment.