CST-111, CST-58, CST-104....

Fixes for couple of tickets