Fix maven resource filtering
Fix up assembly descriptors