FIX: A few issues with regex parsing