Fix checkstyle/findbugs warnings.
WIP: add layer support for inline