Fixed most errors from drawables change