fixes due to status and site