POCO management fixes