Fixes for issues sent by client