Minor fixes on impl.handlers
Minor fixes on impl.handlers

mitchelkuijpers/catacumba,coopsource/catacumba,coopsource/catacumba,funcool/catacumba,prepor/catacumba,mitchelkuijpers/catacumba,funcool/catacumba,funcool/catacumba,prepor/catacumba