Resolved compile-time issues