[TASK] Resolves issues for 4.5 compatibility